merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 28 Oct 2010 10:57:59 +0000 (19:57 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 28 Oct 2010 10:57:59 +0000 (19:57 +0900)
commit5f75307d032ec0392f0e2c3a22ae3ae9034d3104
tree4063e5aa4641de72a2c271567b5a92961cd60f57
parentec065a2f8cc1a2ab13691db23e3c91477da76a41
parent7097d30a908db61a5b15e72f352d4c48c05eba4d
merge trunk